From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 30 May 2012 12:25:00 +0000 (-0400)
Subject: modalDialog: Remove the fade in buttons code
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5596
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=360d94dd67b4dc3c61fae2aed409e7fbbad17864;p=gnome-shell.git

modalDialog: Remove the fade in buttons code

Due to a typo, it never worked correctly. After a fix-up to the appropriate
method, the behavior is suboptimal, as the buttons only fade in the first time
the modal dialog is constructed. Just remove the fade-in behavior, rather than
keeping this non-working code around.

https://bugzilla.gnome.org/show_bug.cgi?id=677426
---

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 71fbfc781..3045daf1c 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -20,7 +20,6 @@ const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
 const OPEN_AND_CLOSE_TIME = 0.1;
-const FADE_IN_BUTTONS_TIME = 0.33;
 const FADE_OUT_DIALOG_TIME = 1.0;
 
 const State = {
@@ -117,8 +116,6 @@ const ModalDialog = new Lang.Class({
     },
 
     setButtons: function(buttons) {
-        let hadChildren = this._buttonLayout.get_children() > 0;
-
         this._buttonLayout.destroy_all_children();
         this._actionKeys = {};
 
@@ -169,21 +166,7 @@ const ModalDialog = new Lang.Class({
                 this._actionKeys[key] = action;
         }
 
-        // Fade in buttons if there weren't any before
-        if (!hadChildren && buttons.length > 0) {
-            this._buttonLayout.opacity = 0;
-            Tweener.addTween(this._buttonLayout,
-                             { opacity: 255,
-                               time: FADE_IN_BUTTONS_TIME,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this, function() {
-                                   this.emit('buttons-set');
-                               })
-                             });
-        } else {
-            this.emit('buttons-set');
-        }
-
+        this.emit('buttons-set');
     },
 
     _onKeyReleaseEvent: function(object, event) {